Skip to content

[release-4.18] OCPBUGS-48644: Fix excessive catalog source snapshots cause severe performance regression#950

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:release-4.18from
oceanc80:catperf-418
Jan 22, 2025
Merged

[release-4.18] OCPBUGS-48644: Fix excessive catalog source snapshots cause severe performance regression#950
openshift-merge-bot[bot] merged 2 commits intoopenshift:release-4.18from
oceanc80:catperf-418

Conversation

@oceanc80
Copy link
Copy Markdown
Contributor

@oceanc80 oceanc80 commented Jan 21, 2025

This is a manual cherry-pick of #937

@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 21, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jan 21, 2025

@oceanc80: This pull request references Jira Issue OCPBUGS-48644, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is a manual cherry-pick of #937

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 21, 2025
@oceanc80
Copy link
Copy Markdown
Contributor Author

oceanc80 commented Jan 21, 2025

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 21, 2025
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2025
@perdasilva
Copy link
Copy Markdown
Contributor

perdasilva commented Jan 21, 2025

/retest

@oceanc80
Copy link
Copy Markdown
Contributor Author

oceanc80 commented Jan 21, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 21, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jan 21, 2025

@oceanc80: This pull request references Jira Issue OCPBUGS-48644, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-48468 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-48468 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents

Requesting review from QA contact:
/cc @kuiwang02

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested a review from kuiwang02 January 21, 2025 19:26
@joelanford @oceanc80
🐛 use operator cache provider for deprecation updates to limit calls …
3261a0b 
…to GRPC server (#3490)

* add log and metric to instrument count of catalog source snapshots

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

* use operator cache provider for deprecation updates to limit calls to GRPC server

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

---------

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1274d54d885649786733d0b3fe499e9670f3310d
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 21, 2025
@joelanford @oceanc80
sort lists of identifiers and conflict messages to reduce SAT solver …
a5fa8a2 
…non-determinism (#3491)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 451e775ea03eb9280399ba0abaf19bd237df167c
@oceanc80
Copy link
Copy Markdown
Contributor Author

oceanc80 commented Jan 21, 2025

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 21, 2025

@oceanc80: you cannot LGTM your own PR.

Details

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@dtfranz
Copy link
Copy Markdown
Contributor

dtfranz commented Jan 21, 2025

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2025
@oceanc80
Copy link
Copy Markdown
Contributor Author

oceanc80 commented Jan 21, 2025

/jira backport release-4.17,release-4.16,release-4.15

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jan 21, 2025

@oceanc80: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15

Details

In response to this:

/jira backport release-4.17,release-4.16,release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 21, 2025

@openshift-ci-robot: once the present PR merges, I will cherry-pick it on top of release-4.15, release-4.16, release-4.17 in new PRs and assign them to you.

Details

In response to this:

@oceanc80: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15

In response to this:

/jira backport release-4.17,release-4.16,release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@bandrade
Copy link
Copy Markdown
Contributor

bandrade commented Jan 21, 2025

/label cherry-pick-approved

@openshift-ci openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 21, 2025
bandrade
bandrade approved these changes Jan 21, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@bandrade bandrade left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bandrade, oceanc80

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@oceanc80
Copy link
Copy Markdown
Contributor Author

oceanc80 commented Jan 21, 2025

/retest

@kuiwang02 kuiwang02 mentioned this pull request Jan 22, 2025
Closed
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 22, 2025

@oceanc80: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn a5fa8a2 link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit 182471a into openshift:release-4.18 Jan 22, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jan 22, 2025

@oceanc80: Jira Issue OCPBUGS-48644: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-48644 has been moved to the MODIFIED state.

Details

In response to this:

This is a manual cherry-pick of #937

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 22, 2025

@openshift-ci-robot: #950 failed to apply on top of branch "release-4.15":

Applying: bug: use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 bug: use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
Details

In response to this:

@oceanc80: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15

In response to this:

/jira backport release-4.17,release-4.16,release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 22, 2025

@openshift-ci-robot: #950 failed to apply on top of branch "release-4.17":

Applying: bug: use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 bug: use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
Details

In response to this:

@oceanc80: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15

In response to this:

/jira backport release-4.17,release-4.16,release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 22, 2025

@openshift-ci-robot: #950 failed to apply on top of branch "release-4.16":

Applying: bug: use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/syncer.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/reconciler.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/subscription/config.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 bug: use operator cache provider for deprecation updates to limit calls to GRPC server (#3490)
Details

In response to this:

@oceanc80: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.17
/cherrypick release-4.16
/cherrypick release-4.15

In response to this:

/jira backport release-4.17,release-4.16,release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jan 22, 2025

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.18.0-202501220232.p0.g182471a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jan 22, 2025

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.18.0-202501220232.p0.g182471a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Jan 22, 2025

[ART PR BUILD NOTIFIER]

Distgit: ose-operator-framework-tools
This PR has been included in build ose-operator-framework-tools-container-v4.18.0-202501220232.p0.g182471a.assembly.stream.el9.
All builds following this will include this PR.

@oceanc80 oceanc80 deleted the catperf-418 branch January 22, 2025 03:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

@perdasilva perdasilva Awaiting requested review from perdasilva

@kuiwang02 kuiwang02 Awaiting requested review from kuiwang02

1 more reviewer

@bandrade bandrade bandrade approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@bandrade bandrade

@dtfranz dtfranz

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.